remus: Fix makefiles for indentation

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

diff --git a/tools/remus/Makefile b/tools/remus/Makefile
index 70e175075fddf1a72975dd4ac0c4ce81b50c03a6..dcb4b4d0b523698b4096047652c29f3c13448ac8 100644 (file)
--- a/tools/remus/Makefile
+++ b/tools/remus/Makefile
@@ -10,8 +10,8 @@ all: subdirs-all
 
 .PHONY: install
 install: subdirs-install
-       $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
-       $(INSTALL_PYTHON_PROG) $(SCRIPTS) $(DESTDIR)$(BINDIR)
+       $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
+       $(INSTALL_PYTHON_PROG) $(SCRIPTS) $(DESTDIR)$(BINDIR)
 
 .PHONY: clean
 clean: subdirs-clean

diff --git a/tools/remus/imqebt/Makefile b/tools/remus/imqebt/Makefile
index fcbfb5ba1126d4528042ad75119a59bee83b2771..f2d3f067126a8db32d056bac14e0dc64cb710120 100644 (file)
--- a/tools/remus/imqebt/Makefile
+++ b/tools/remus/imqebt/Makefile
@@ -31,11 +31,11 @@ EBTD_CMDLINE_MAXLN?=2048
 EBTD_ARGC_MAX?=50
 
 PROGSPECS:=-DPROGVERSION=\"$(PROGVERSION)\" \
-       -DPROGNAME=\"$(PROGNAME)\" \
-       -DPROGDATE=\"$(PROGDATE)\" \
-       -D_PATH_ETHERTYPES=\"$(ETHERTYPESFILE)\" \
-       -DEBTD_ARGC_MAX=$(EBTD_ARGC_MAX) \
-       -DEBTD_CMDLINE_MAXLN=$(EBTD_CMDLINE_MAXLN)
+       -DPROGNAME=\"$(PROGNAME)\" \
+       -DPROGDATE=\"$(PROGDATE)\" \
+       -D_PATH_ETHERTYPES=\"$(ETHERTYPESFILE)\" \
+       -DEBTD_ARGC_MAX=$(EBTD_ARGC_MAX) \
+       -DEBTD_CMDLINE_MAXLN=$(EBTD_CMDLINE_MAXLN)
 
 # Uncomment for debugging (slower)
 #PROGSPECS+=-DEBT_DEBUG
@@ -52,46 +52,46 @@ build: $(PROGRAMS)
 # a little scripting for a static binary, making one for ebtables-restore
 # should be completely analogous
 imqebt: extensions/ebt_*.c extensions/ebtable_*.c ebtables.c communication.c ebtables-standalone.c getethertype.c libebtc.c useful_functions.c
-       cp ebtables-standalone.c ebtables-standalone.c_ ; \
-       cp include/ebtables_u.h include/ebtables_u.h_ ; \
-       sed "s/ main(/ pseudomain(/" ebtables-standalone.c > ebtables-standalone.c__ ; \
-       mv ebtables-standalone.c__ ebtables-standalone.c ; \
-       printf "\nint main(int argc, char *argv[])\n{\n "  >> ebtables-standalone.c ; \
-       for arg in $(EXT_FUNC) \
-       ; do \
-       sed s/_init/_$${arg}_init/ extensions/ebt_$${arg}.c > extensions/ebt_$${arg}.c_ ; \
-       mv extensions/ebt_$${arg}.c_ extensions/ebt_$${arg}.c ; \
-       printf "\t%s();\n" _$${arg}_init >> ebtables-standalone.c ; \
-       printf "extern void %s(void);\n" _$${arg}_init >> include/ebtables_u.h ; \
-       done ; \
-       for arg in $(EXT_TABLES) \
-       ; do \
-       sed s/_init/_t_$${arg}_init/ extensions/ebtable_$${arg}.c > extensions/ebtable_$${arg}.c_ ; \
-       mv extensions/ebtable_$${arg}.c_ extensions/ebtable_$${arg}.c ; \
-       printf "\t%s();\n" _t_$${arg}_init >> ebtables-standalone.c ; \
-       printf "extern void %s(void);\n" _t_$${arg}_init >> include/ebtables_u.h ; \
-       done ; \
-       printf "\n\tpseudomain(argc, argv);\n\treturn 0;\n}\n" >> ebtables-standalone.c ;\
-       $(CC) $(CFLAGS) $(PROGSPECS) -o $@ $^ -I$(KERNEL_INCLUDES) -Iinclude ; \
-       for arg in $(EXT_FUNC) \
-       ; do \
-       sed "s/ .*_init/ _init/" extensions/ebt_$${arg}.c > extensions/ebt_$${arg}.c_ ; \
-       mv extensions/ebt_$${arg}.c_ extensions/ebt_$${arg}.c ; \
-       done ; \
-       for arg in $(EXT_TABLES) \
-       ; do \
-       sed "s/ .*_init/ _init/" extensions/ebtable_$${arg}.c > extensions/ebtable_$${arg}.c_ ; \
-       mv extensions/ebtable_$${arg}.c_ extensions/ebtable_$${arg}.c ; \
-       done ; \
-       mv ebtables-standalone.c_ ebtables-standalone.c ; \
-       mv include/ebtables_u.h_ include/ebtables_u.h
+       cp ebtables-standalone.c ebtables-standalone.c_ ; \
+       cp include/ebtables_u.h include/ebtables_u.h_ ; \
+       sed "s/ main(/ pseudomain(/" ebtables-standalone.c > ebtables-standalone.c__ ; \
+       mv ebtables-standalone.c__ ebtables-standalone.c ; \
+       printf "\nint main(int argc, char *argv[])\n{\n "  >> ebtables-standalone.c ; \
+       for arg in $(EXT_FUNC) \
+       ; do \
+       sed s/_init/_$${arg}_init/ extensions/ebt_$${arg}.c > extensions/ebt_$${arg}.c_ ; \
+       mv extensions/ebt_$${arg}.c_ extensions/ebt_$${arg}.c ; \
+       printf "\t%s();\n" _$${arg}_init >> ebtables-standalone.c ; \
+       printf "extern void %s(void);\n" _$${arg}_init >> include/ebtables_u.h ; \
+       done ; \
+       for arg in $(EXT_TABLES) \
+       ; do \
+       sed s/_init/_t_$${arg}_init/ extensions/ebtable_$${arg}.c > extensions/ebtable_$${arg}.c_ ; \
+       mv extensions/ebtable_$${arg}.c_ extensions/ebtable_$${arg}.c ; \
+       printf "\t%s();\n" _t_$${arg}_init >> ebtables-standalone.c ; \
+       printf "extern void %s(void);\n" _t_$${arg}_init >> include/ebtables_u.h ; \
+       done ; \
+       printf "\n\tpseudomain(argc, argv);\n\treturn 0;\n}\n" >> ebtables-standalone.c ;\
+       $(CC) $(CFLAGS) $(PROGSPECS) -o $@ $^ -I$(KERNEL_INCLUDES) -Iinclude ; \
+       for arg in $(EXT_FUNC) \
+       ; do \
+       sed "s/ .*_init/ _init/" extensions/ebt_$${arg}.c > extensions/ebt_$${arg}.c_ ; \
+       mv extensions/ebt_$${arg}.c_ extensions/ebt_$${arg}.c ; \
+       done ; \
+       for arg in $(EXT_TABLES) \
+       ; do \
+       sed "s/ .*_init/ _init/" extensions/ebtable_$${arg}.c > extensions/ebtable_$${arg}.c_ ; \
+       mv extensions/ebtable_$${arg}.c_ extensions/ebtable_$${arg}.c ; \
+       done ; \
+       mv ebtables-standalone.c_ ebtables-standalone.c ; \
+       mv include/ebtables_u.h_ include/ebtables_u.h
 
 .PHONY: install
 install: build
-       $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR)
-       $(INSTALL_PROG) $(PROGRAMS) $(DESTDIR)$(PRIVATE_BINDIR)
+       $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR)
+       $(INSTALL_PROG) $(PROGRAMS) $(DESTDIR)$(PRIVATE_BINDIR)
 
 .PHONY: clean
 clean:
-       rm -f imqebt
-       rm -f *.o *~ *.so
+       rm -f imqebt
+       rm -f *.o *~ *.so

diff --git a/tools/remus/imqebt/extensions/Makefile b/tools/remus/imqebt/extensions/Makefile
index 3a07fb5ed80ad6fb01987acb860fa580e494b03e..fd53b420b0681d0eb55ad115730a0a90f6a3a8d3 100644 (file)
--- a/tools/remus/imqebt/extensions/Makefile
+++ b/tools/remus/imqebt/extensions/Makefile
@@ -10,20 +10,20 @@ EXT_LIBSI+=$(foreach T,$(EXT_FUNC), -lebt_$(T))
 EXT_LIBSI+=$(foreach T,$(EXT_TABLES), -lebtable_$(T))
 
 extensions/ebt_%.so: extensions/ebt_%.o
-       $(CC) -shared -o $@ -lc $< -nostartfiles
+       $(CC) -shared -o $@ -lc $< -nostartfiles
 
 extensions/libebt_%.so: extensions/ebt_%.so
-       mv $< $@
+       mv $< $@
 
 extensions/ebtable_%.so: extensions/ebtable_%.o
-       $(CC) -shared -o $@ -lc $< -nostartfiles
+       $(CC) -shared -o $@ -lc $< -nostartfiles
 
 extensions/libebtable_%.so: extensions/ebtable_%.so
-       mv $< $@
+       mv $< $@
 
 extensions/ebt_%.o: extensions/ebt_%.c include/ebtables_u.h
-       $(CC) $(CFLAGS) $(CFLAGS_SH_LIB) $(PROGSPECS) -c -o $@ $< -I$(KERNEL_INCLUDES)
+       $(CC) $(CFLAGS) $(CFLAGS_SH_LIB) $(PROGSPECS) -c -o $@ $< -I$(KERNEL_INCLUDES)
 
 extensions/ebtable_%.o: extensions/ebtable_%.c
-       $(CC) $(CFLAGS) $(CFLAGS_SH_LIB) $(PROGSPECS) -c -o $@ $< -I$(KERNEL_INCLUDES)
+       $(CC) $(CFLAGS) $(CFLAGS_SH_LIB) $(PROGSPECS) -c -o $@ $< -I$(KERNEL_INCLUDES)
 

diff --git a/tools/remus/kmod/Makefile b/tools/remus/kmod/Makefile
index 57802690860dc2fe7f0babbf713b5ebe5eba6b7e..e57e7bd899d0093a7f686edf7b3c82c669562f83 100644 (file)
--- a/tools/remus/kmod/Makefile
+++ b/tools/remus/kmod/Makefile
@@ -14,11 +14,11 @@ KERNELDIR ?= $(XEN_ROOT)/build-linux-$(LINUX_VER)_$(XEN_TARGET_ARCH)
 
 .PHONY: all
 all:
-       if test -d $(KERNELDIR); then $(MAKE) -C $(KERNELDIR) SUBDIRS=`pwd` modules; fi
+       if test -d $(KERNELDIR); then $(MAKE) -C $(KERNELDIR) SUBDIRS=`pwd` modules; fi
 
 .PHONY: install
 install:
-       if test -d $(KERNELDIR); then $(MAKE) -C $(KERNELDIR) SUBDIRS=`pwd` INSTALL_MOD_PATH=$(DESTDIR) modules_install; fi
+       if test -d $(KERNELDIR); then $(MAKE) -C $(KERNELDIR) SUBDIRS=`pwd` INSTALL_MOD_PATH=$(DESTDIR) modules_install; fi
 
 clean::
-       -rm -rf *.o *.ko *.mod.c *.mod.o Module.symvers .*.cmd .tmp_versions
+       -rm -rf *.o *.ko *.mod.c *.mod.o Module.symvers .*.cmd .tmp_versions